Auto merge of #2209 - felixc:master, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 14 Dec 2015 18:37:03 +0000 (18:37 +0000)
committerbors <bors@rust-lang.org>
Mon, 14 Dec 2015 18:37:03 +0000 (18:37 +0000)

Trivial merge